Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 07:04:05 +0000 (00:04 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 16 Jul 2011 07:04:05 +0000 (00:04 -0700)
commitbbc02ff50e9c8a0972c42fe0e2f636e21c64dc27
tree1824001fbeb31a695e6880f355bd97ac2e12f0d2
parent800352275bbe704775d6c93e79186dc717d71da0
parent8e84045700ec8be4a0d8b92a46ebc72bc65c88f2
Merge from trunk.